auto merge of #627 : dotdash/cargo/rustup, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 24 Sep 2014 09:13:40 +0000 (09:13 +0000)
committerbors <bors@rust-lang.org>
Wed, 24 Sep 2014 09:13:40 +0000 (09:13 +0000)

Trivial merge